Autogenerated HTML docs for v2.31.1-331-gb0c09a
diff --git a/RelNotes/2.32.0.txt b/RelNotes/2.32.0.txt index ea220f2..c746ad1 100644 --- a/RelNotes/2.32.0.txt +++ b/RelNotes/2.32.0.txt
@@ -120,6 +120,12 @@ * The last remnant of gettext-poison has been removed. + * The test framework has been taught to optionally turn the default + merge strategy to "ort" throughout the system where we use + three-way merges internally, like cherry-pick, rebase etc., + primarily to enhance its test coverage (the strategy has been + available as an explicit "-s ort" choice). + Fixes since v2.31 -----------------
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index ad482ee..8068c7d 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:47 PDT + 2021-04-16 15:13:14 PDT </div> </div> </body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index a32d465..422f665 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:46 PDT + 2021-04-16 15:13:13 PDT </div> </div> </body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 385b5ed..14c705e 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:46 PDT + 2021-04-16 15:13:14 PDT </div> </div> </body>
diff --git a/howto/new-command.html b/howto/new-command.html index 7cac89b..995c07d 100644 --- a/howto/new-command.html +++ b/howto/new-command.html
@@ -863,7 +863,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:39 PDT + 2021-04-16 15:13:09 PDT </div> </div> </body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 1ee494b..8cd7e68 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:46 PDT + 2021-04-16 15:13:13 PDT </div> </div> </body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index f5d92e8..0e42c77 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:45 PDT + 2021-04-16 15:13:13 PDT </div> </div> </body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 3dca884..ce339e0 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:45 PDT + 2021-04-16 15:13:12 PDT </div> </div> </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 4c2599e..df6ebca 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:45 PDT + 2021-04-16 15:13:13 PDT </div> </div> </body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index db52261..55cfa5a 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:44 PDT + 2021-04-16 15:13:12 PDT </div> </div> </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 00e71d5..8303263 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:40 PDT + 2021-04-16 15:13:09 PDT </div> </div> </body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 3f0770b..23fd4f3 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:43 PDT + 2021-04-16 15:13:11 PDT </div> </div> </body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 2749845..1a99cb6 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:42 PDT + 2021-04-16 15:13:11 PDT </div> </div> </body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index d1a6a8a..c342ca3 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:42 PDT + 2021-04-16 15:13:10 PDT </div> </div> </body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index ad8d89f..c5442b6 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:41 PDT + 2021-04-16 15:13:10 PDT </div> </div> </body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 9697464..ca1f2de 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:40 PDT + 2021-04-16 15:13:09 PDT </div> </div> </body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 7ffb71e..fae3f9e 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-04-15 14:09:41 PDT + 2021-04-16 15:13:10 PDT </div> </div> </body>
